From: Stefan Monnier Date: Mon, 4 Apr 2011 01:10:13 +0000 (-0400) Subject: * src/keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4227 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=48b28ff9cebedb81d39b6617e95c32237907b59c;p=emacs.git * src/keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the first non-nil return value). --- diff --git a/src/ChangeLog b/src/ChangeLog index 902cf132888..3c7ab8ea1c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-04 Stefan Monnier + + * keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the + first non-nil return value). + 2011-04-03 Jan Djärv * nsterm.m (ns_update_auto_hide_menu_bar): Define MAC_OS_X_VERSION_10_6 diff --git a/src/keyboard.c b/src/keyboard.c index d307250b868..f766dd7d697 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1870,7 +1870,8 @@ safe_run_hook_funcall (size_t nargs, Lisp_Object *args) else Vinhibit_quit = Fcons (Vinhibit_quit, args[0]); - return internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error); + internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error); + return Qnil; } /* If we get an error while running the hook, cause the hook variable